From: Jan Vesely <jano.vesely@gmail.com>
Date: Sun, 5 May 2019 02:10:19 +0000 (-0400)
Subject: gitlab-ci: Consolidate configuraiton into hierarchy of extensible configs
X-Git-Tag: archive/raspbian/1%0.1.106-3+rpi1^2~15^2~11^2~117
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=64ef08ed3f52c9193f8ba1bf2d50162baa64e416;p=babl.git

gitlab-ci: Consolidate configuraiton into hierarchy of extensible configs

Signed-off-by: Jan Vesely <jano.vesely@gmail.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac1a604..bca1a79 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,47 +1,51 @@
-.artifacts-meson: &artifacts-meson
-  when: always
-  paths:
-   - _build/meson-logs
-
-.artifacts-autotools: &artifacts-autotools
-  when: always
-  paths:
-    - _build/*.log
-    - _build/*/*.log
-    - _build/*/*/*.log
+.build:
+  stage: build
+  image: archlinux/base:latest
 
-.meson-build: &meson-build
-  - meson _build
-      -D enable-f16c=true
-      -D enable-mmx=true
-      -D enable-sse=true
-      -D enable-sse2=true
-      -D enable-sse3=true
-      -D enable-sse4_1=true
-      -D with-docs=true
-      ${LCMS_OPTION}
-  - ninja -C _build
-  - ninja -C _build test
+.meson-build:
+  extends: .build
+  artifacts:
+    when: always
+    paths:
+      - _build/meson-logs
+  script:
+    - meson _build
+        -D enable-f16c=true
+        -D enable-mmx=true
+        -D enable-sse=true
+        -D enable-sse2=true
+        -D enable-sse3=true
+        -D enable-sse4_1=true
+        -D with-docs=true
+        ${LCMS_OPTION}
+    - ninja -C _build
+    - ninja -C _build test
 
-.autotools-build: &autotools-build
-  - mkdir _build
-  - cd _build
-  - ../autogen.sh
-      --enable-docs
-      --enable-f16c
-      --enable-mmx
-      --enable-sse
-      --enable-sse2
-      --enable-sse3
-      --enable-sse4_1
-      ${LCMS_OPTION}
-  - make
-  - make check
+.autotools-build:
+  extends: .build
+  artifacts:
+    when: always
+    paths:
+      - _build/*.log
+      - _build/*/*.log
+      - _build/*/*/*.log
+  script:
+    - mkdir _build
+    - cd _build
+    - ../autogen.sh
+        --enable-docs
+        --enable-f16c
+        --enable-mmx
+        --enable-sse
+        --enable-sse2
+        --enable-sse3
+        --enable-sse4_1
+        ${LCMS_OPTION}
+    - make
+    - make check
 
 latest-meson-lcms:
-  stage: build
-  image: archlinux/base:latest
-  artifacts: *artifacts-meson
+  extends: .meson-build
   variables:
     LCMS_OPTION : "-Dwith-lcms=true"
   before_script:
@@ -50,12 +54,9 @@ latest-meson-lcms:
         meson
         lcms2
         git
-  script: *meson-build
 
 latest-meson-nolcms:
-  stage: build
-  image: archlinux/base:latest
-  artifacts: *artifacts-meson
+  extends: .meson-build
   variables:
     LCMS_OPTION : "-Dwith-lcms=false"
   before_script:
@@ -64,12 +65,9 @@ latest-meson-nolcms:
         meson
         lcms2
         git
-  script: *meson-build
 
 latest-autotools-lcms:
-  stage: build
-  image: archlinux/base:latest
-  artifacts: *artifacts-autotools
+  extends: .autotools-build
   variables:
     LCMS_OPTION : "--with-lcms"
   before_script:
@@ -77,16 +75,12 @@ latest-autotools-lcms:
         base-devel
         lcms2
         git
-  script: *autotools-build
 
 latest-autotools-nolcms:
-  stage: build
-  image: archlinux/base:latest
-  artifacts: *artifacts-autotools
+  extends: .autotools-build
   variables:
     LCMS_OPTION : "--without-lcms"
   before_script:
     - pacman -Syu --noconfirm --needed
         base-devel
         git
-  script: *autotools-build